From 040db1efcdd0d533761b12aefb1953846b37f6b1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Tue, 4 Oct 2016 17:56:06 +0200
Subject: [PATCH] Remove some deprecated GdkColor style properties

---
 gtk/gtkiconview.c                       | 17 ---------
 gtk/gtktexttag.c                        | 47 -------------------------
 testsuite/reftests/textview-tags.ref.ui |  8 ++---
 testsuite/reftests/textview-tags.ui     |  8 ++---
 4 files changed, 8 insertions(+), 72 deletions(-)

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 54d89824a6..24031c0859 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -673,23 +673,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
   g_object_class_override_property (gobject_class, PROP_HSCROLL_POLICY, "hscroll-policy");
   g_object_class_override_property (gobject_class, PROP_VSCROLL_POLICY, "vscroll-policy");
 
-  /* Style properties */
-  /**
-   * GtkIconView:selection-box-color:
-   *
-   * The color of the selection box.
-   *
-   * Deprecated: 3.20: The color of the selection box is determined by CSS;
-   *     the value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_boxed ("selection-box-color",
-                                                               P_("Selection Box Color"),
-                                                               P_("Color of the selection box"),
-                                                               g_type_from_name ("GdkColor"),
-                                                               GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
-
   /**
    * GtkIconView:selection-box-alpha:
    *
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index cbc1a2f3f4..eeeb11628c 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -217,21 +217,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         NULL,
                                                         GTK_PARAM_WRITABLE));
 
-  /**
-   * GtkTextTag:background-gdk:
-   *
-   * Background color as a #GdkColor.
-   *
-   * Deprecated: 3.4: Use #GtkTextTag:background-rgba instead.
-   */
-  g_object_class_install_property (object_class,
-                                   PROP_BACKGROUND_GDK,
-                                   g_param_spec_boxed ("background-gdk",
-                                                       P_("Background color"),
-                                                       P_("Background color as a GdkColor"),
-                                                       g_type_from_name ("GdkColor"),
-                                                       GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
-
   /**
    * GtkTextTag:background-rgba:
    *
@@ -263,21 +248,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         NULL,
                                                         GTK_PARAM_WRITABLE));
 
-  /**
-   * GtkTextTag:foreground-gdk:
-   *
-   * Foreground color as a #GdkColor.
-   *
-   * Deprecated: 3.4: Use #GtkTextTag:foreground-rgba instead.
-   */
-  g_object_class_install_property (object_class,
-                                   PROP_FOREGROUND_GDK,
-                                   g_param_spec_boxed ("foreground-gdk",
-                                                       P_("Foreground color"),
-                                                       P_("Foreground color as a GdkColor"),
-                                                       g_type_from_name ("GdkColor"),
-                                                       GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
-
   /**
    * GtkTextTag:foreground-rgba:
    *
@@ -614,23 +584,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         NULL,
                                                         GTK_PARAM_WRITABLE));
 
-  /**
-   * GtkTextTag:paragraph-background-gdk:
-   *
-   * The paragraph background color as a #GdkColor.
-   *
-   * Since: 2.8
-   *
-   * Deprecated: 3.4: Use #GtkTextTag:paragraph-background-rgba instead.
-   */
-  g_object_class_install_property (object_class,
-                                   PROP_PARAGRAPH_BACKGROUND_GDK,
-                                   g_param_spec_boxed ("paragraph-background-gdk",
-                                                       P_("Paragraph background color"),
-                                                       P_("Paragraph background color as a GdkColor"),
-                                                       g_type_from_name ("GdkColor"),
-                                                       GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
-
   /**
    * GtkTextTag:paragraph-background-rgba:
    *
diff --git a/testsuite/reftests/textview-tags.ref.ui b/testsuite/reftests/textview-tags.ref.ui
index 8b9fede1be..97c0896d08 100644
--- a/testsuite/reftests/textview-tags.ref.ui
+++ b/testsuite/reftests/textview-tags.ref.ui
@@ -5,28 +5,28 @@
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">red</property>
-        <property name="foreground">red</property>
+        <property name="foreground-rgba">red</property>
         <property name="font">Normal</property>
       </object>
     </child>
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">blue</property>
-        <property name="foreground">blue</property>
+        <property name="foreground-rgba">blue</property>
         <property name="font">Normal</property>
       </object>
     </child>
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">black</property>
-        <property name="foreground">black</property>
+        <property name="foreground-rgba">black</property>
         <property name="font">Normal</property>
       </object>
     </child>
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">white</property>
-        <property name="foreground">white</property>
+        <property name="foreground-rgba">white</property>
         <property name="font">Normal</property>
       </object>
     </child>
diff --git a/testsuite/reftests/textview-tags.ui b/testsuite/reftests/textview-tags.ui
index c04ebf0e1b..622a08a781 100644
--- a/testsuite/reftests/textview-tags.ui
+++ b/testsuite/reftests/textview-tags.ui
@@ -5,28 +5,28 @@
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">red</property>
-        <property name="foreground">red</property>
+        <property name="foreground-rgba">red</property>
         <property name="font">Normal</property>
       </object>
     </child>
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">blue</property>
-        <property name="foreground">blue</property>
+        <property name="foreground-rgba">blue</property>
         <property name="font">Normal</property>
       </object>
     </child>
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">black</property>
-        <property name="foreground">black</property>
+        <property name="foreground-rgba">black</property>
         <property name="font">Normal</property>
       </object>
     </child>
     <child type="tag">
       <object class="GtkTextTag">
         <property name="name">white</property>
-        <property name="foreground">white</property>
+        <property name="foreground-rgba">white</property>
         <property name="font">Normal</property>
       </object>
     </child>
-- 
2.30.2